merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 2 Sep 2010 00:58:05 +0000 (09:58 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 2 Sep 2010 00:58:05 +0000 (09:58 +0900)

Trivial merge